Merge.
authoradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Thu, 18 Aug 2005 18:40:02 +0000 (10:40 -0800)
committeradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Thu, 18 Aug 2005 18:40:02 +0000 (10:40 -0800)

Trivial merge